<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.6" />
<title>[Git GUIDE] Advanced use</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

/* Default font. */
body {
  font-family: Georgia,serif;
}

/* Title font. */
h1, h2, h3, h4, h5, h6,
div.title, caption.title,
thead, p.table.header,
#toctitle,
#author, #revnumber, #revdate, #revremark,
#footer {
  font-family: Arial,Helvetica,sans-serif;
}

body {
  margin: 1em 5% 1em 5%;
}

a {
  color: blue;
  text-decoration: underline;
}
a:visited {
  color: fuchsia;
}

em {
  font-style: italic;
  color: navy;
}

strong {
  font-weight: bold;
  color: #083194;
}

h1, h2, h3, h4, h5, h6 {
  color: #527bbd;
  margin-top: 1.2em;
  margin-bottom: 0.5em;
  line-height: 1.3;
}

h1, h2, h3 {
  border-bottom: 2px solid silver;
}
h2 {
  padding-top: 0.5em;
}
h3 {
  float: left;
}
h3 + * {
  clear: left;
}
h5 {
  font-size: 1.0em;
}

div.sectionbody {
  margin-left: 0;
}

hr {
  border: 1px solid silver;
}

p {
  margin-top: 0.5em;
  margin-bottom: 0.5em;
}

ul, ol, li > p {
  margin-top: 0;
}
ul > li     { color: #aaa; }
ul > li > * { color: black; }

pre {
  padding: 0;
  margin: 0;
}

#author {
  color: #527bbd;
  font-weight: bold;
  font-size: 1.1em;
}
#email {
}
#revnumber, #revdate, #revremark {
}

#footer {
  font-size: small;
  border-top: 2px solid silver;
  padding-top: 0.5em;
  margin-top: 4.0em;
}
#footer-text {
  float: left;
  padding-bottom: 0.5em;
}
#footer-badges {
  float: right;
  padding-bottom: 0.5em;
}

#preamble {
  margin-top: 1.5em;
  margin-bottom: 1.5em;
}
div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
div.admonitionblock {
  margin-top: 2.0em;
  margin-bottom: 2.0em;
  margin-right: 10%;
  color: #606060;
}

div.content { /* Block element content. */
  padding: 0;
}

/* Block element titles. */
div.title, caption.title {
  color: #527bbd;
  font-weight: bold;
  text-align: left;
  margin-top: 1.0em;
  margin-bottom: 0.5em;
}
div.title + * {
  margin-top: 0;
}

td div.title:first-child {
  margin-top: 0.0em;
}
div.content div.title:first-child {
  margin-top: 0.0em;
}
div.content + div.title {
  margin-top: 0.0em;
}

div.sidebarblock > div.content {
  background: #ffffee;
  border: 1px solid #dddddd;
  border-left: 4px solid #f0f0f0;
  padding: 0.5em;
}

div.listingblock > div.content {
  border: 1px solid #dddddd;
  border-left: 5px solid #f0f0f0;
  background: #f8f8f8;
  padding: 0.5em;
}

div.quoteblock, div.verseblock {
  padding-left: 1.0em;
  margin-left: 1.0em;
  margin-right: 10%;
  border-left: 5px solid #f0f0f0;
  color: #888;
}

div.quoteblock > div.attribution {
  padding-top: 0.5em;
  text-align: right;
}

div.verseblock > pre.content {
  font-family: inherit;
  font-size: inherit;
}
div.verseblock > div.attribution {
  padding-top: 0.75em;
  text-align: left;
}
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
  text-align: left;
}

div.admonitionblock .icon {
  vertical-align: top;
  font-size: 1.1em;
  font-weight: bold;
  text-decoration: underline;
  color: #527bbd;
  padding-right: 0.5em;
}
div.admonitionblock td.content {
  padding-left: 0.5em;
  border-left: 3px solid #dddddd;
}

div.exampleblock > div.content {
  border-left: 3px solid #dddddd;
  padding-left: 0.5em;
}

div.imageblock div.content { padding-left: 0; }
span.image img { border-style: none; }
a.image:visited { color: white; }

dl {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
}
dt {
  margin-top: 0.5em;
  margin-bottom: 0;
  font-style: normal;
  color: navy;
}
dd > *:first-child {
  margin-top: 0.1em;
}

ul, ol {
    list-style-position: outside;
}
ol.arabic {
  list-style-type: decimal;
}
ol.loweralpha {
  list-style-type: lower-alpha;
}
ol.upperalpha {
  list-style-type: upper-alpha;
}
ol.lowerroman {
  list-style-type: lower-roman;
}
ol.upperroman {
  list-style-type: upper-roman;
}

div.compact ul, div.compact ol,
div.compact p, div.compact p,
div.compact div, div.compact div {
  margin-top: 0.1em;
  margin-bottom: 0.1em;
}

tfoot {
  font-weight: bold;
}
td > div.verse {
  white-space: pre;
}

div.hdlist {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
}
div.hdlist tr {
  padding-bottom: 15px;
}
dt.hdlist1.strong, td.hdlist1.strong {
  font-weight: bold;
}
td.hdlist1 {
  vertical-align: top;
  font-style: normal;
  padding-right: 0.8em;
  color: navy;
}
td.hdlist2 {
  vertical-align: top;
}
div.hdlist.compact tr {
  margin: 0;
  padding-bottom: 0;
}

.comment {
  background: yellow;
}

.footnote, .footnoteref {
  font-size: 0.8em;
}

span.footnote, span.footnoteref {
  vertical-align: super;
}

#footnotes {
  margin: 20px 0 20px 0;
  padding: 7px 0 0 0;
}

#footnotes div.footnote {
  margin: 0 0 5px 0;
}

#footnotes hr {
  border: none;
  border-top: 1px solid silver;
  height: 1px;
  text-align: left;
  margin-left: 0;
  width: 20%;
  min-width: 100px;
}

div.colist td {
  padding-right: 0.5em;
  padding-bottom: 0.3em;
  vertical-align: top;
}
div.colist td img {
  margin-top: 0.3em;
}

@media print {
  #footer-badges { display: none; }
}

#toc {
  margin-bottom: 2.5em;
}

#toctitle {
  color: #527bbd;
  font-size: 1.1em;
  font-weight: bold;
  margin-top: 1.0em;
  margin-bottom: 0.1em;
}

div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
  margin-top: 0;
  margin-bottom: 0;
}
div.toclevel2 {
  margin-left: 2em;
  font-size: 0.9em;
}
div.toclevel3 {
  margin-left: 4em;
  font-size: 0.9em;
}
div.toclevel4 {
  margin-left: 6em;
  font-size: 0.9em;
}

span.aqua { color: aqua; }
span.black { color: black; }
span.blue { color: blue; }
span.fuchsia { color: fuchsia; }
span.gray { color: gray; }
span.green { color: green; }
span.lime { color: lime; }
span.maroon { color: maroon; }
span.navy { color: navy; }
span.olive { color: olive; }
span.purple { color: purple; }
span.red { color: red; }
span.silver { color: silver; }
span.teal { color: teal; }
span.white { color: white; }
span.yellow { color: yellow; }

span.aqua-background { background: aqua; }
span.black-background { background: black; }
span.blue-background { background: blue; }
span.fuchsia-background { background: fuchsia; }
span.gray-background { background: gray; }
span.green-background { background: green; }
span.lime-background { background: lime; }
span.maroon-background { background: maroon; }
span.navy-background { background: navy; }
span.olive-background { background: olive; }
span.purple-background { background: purple; }
span.red-background { background: red; }
span.silver-background { background: silver; }
span.teal-background { background: teal; }
span.white-background { background: white; }
span.yellow-background { background: yellow; }

span.big { font-size: 2em; }
span.small { font-size: 0.6em; }

span.underline { text-decoration: underline; }
span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }


/*
 * xhtml11 specific
 *
 * */

tt {
  font-family: monospace;
  font-size: inherit;
  color: navy;
}

div.tableblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
div.tableblock > table {
  border: 3px solid #527bbd;
}
thead, p.table.header {
  font-weight: bold;
  color: #527bbd;
}
p.table {
  margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
  border-style: none;
}
div.tableblock > table[frame="hsides"] {
  border-left-style: none;
  border-right-style: none;
}
div.tableblock > table[frame="vsides"] {
  border-top-style: none;
  border-bottom-style: none;
}


/*
 * html5 specific
 *
 * */

.monospaced {
  font-family: monospace;
  font-size: inherit;
  color: navy;
}

table.tableblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
thead, p.tableblock.header {
  font-weight: bold;
  color: #527bbd;
}
p.tableblock {
  margin-top: 0;
}
table.tableblock {
  border-width: 3px;
  border-spacing: 0px;
  border-style: solid;
  border-color: #527bbd;
  border-collapse: collapse;
}
th.tableblock, td.tableblock {
  border-width: 1px;
  padding: 4px;
  border-style: solid;
  border-color: #527bbd;
}

table.tableblock.frame-topbot {
  border-left-style: hidden;
  border-right-style: hidden;
}
table.tableblock.frame-sides {
  border-top-style: hidden;
  border-bottom-style: hidden;
}
table.tableblock.frame-none {
  border-style: hidden;
}

th.tableblock.halign-left, td.tableblock.halign-left {
  text-align: left;
}
th.tableblock.halign-center, td.tableblock.halign-center {
  text-align: center;
}
th.tableblock.halign-right, td.tableblock.halign-right {
  text-align: right;
}

th.tableblock.valign-top, td.tableblock.valign-top {
  vertical-align: top;
}
th.tableblock.valign-middle, td.tableblock.valign-middle {
  vertical-align: middle;
}
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
  vertical-align: bottom;
}


/*
 * manpage specific
 *
 * */

body.manpage h1 {
  padding-top: 0.5em;
  padding-bottom: 0.5em;
  border-top: 2px solid silver;
  border-bottom: 2px solid silver;
}
body.manpage h2 {
  border-style: none;
}
body.manpage div.sectionbody {
  margin-left: 3em;
}

@media print {
  body.manpage div#toc { display: none; }
}
</style>
<script type="text/javascript">
/*<![CDATA[*/
var asciidoc = {  // Namespace.

/////////////////////////////////////////////////////////////////////
// Table Of Contents generator
/////////////////////////////////////////////////////////////////////

/* Author: Mihai Bazon, September 2002
 * http://students.infoiasi.ro/~mishoo
 *
 * Table Of Content generator
 * Version: 0.4
 *
 * Feel free to use this script under the terms of the GNU General Public
 * License, as long as you do not remove or alter this notice.
 */

 /* modified by Troy D. Hanson, September 2006. License: GPL */
 /* modified by Stuart Rackham, 2006, 2009. License: GPL */

// toclevels = 1..4.
toc: function (toclevels) {

  function getText(el) {
    var text = "";
    for (var i = el.firstChild; i != null; i = i.nextSibling) {
      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
        text += i.data;
      else if (i.firstChild != null)
        text += getText(i);
    }
    return text;
  }

  function TocEntry(el, text, toclevel) {
    this.element = el;
    this.text = text;
    this.toclevel = toclevel;
  }

  function tocEntries(el, toclevels) {
    var result = new Array;
    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
    // Function that scans the DOM tree for header elements (the DOM2
    // nodeIterator API would be a better technique but not supported by all
    // browsers).
    var iterate = function (el) {
      for (var i = el.firstChild; i != null; i = i.nextSibling) {
        if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
          var mo = re.exec(i.tagName);
          if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
            result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
          }
          iterate(i);
        }
      }
    }
    iterate(el);
    return result;
  }

  var toc = document.getElementById("toc");
  if (!toc) {
    return;
  }

  // Delete existing TOC entries in case we're reloading the TOC.
  var tocEntriesToRemove = [];
  var i;
  for (i = 0; i < toc.childNodes.length; i++) {
    var entry = toc.childNodes[i];
    if (entry.nodeName == 'div'
     && entry.getAttribute("class")
     && entry.getAttribute("class").match(/^toclevel/))
      tocEntriesToRemove.push(entry);
  }
  for (i = 0; i < tocEntriesToRemove.length; i++) {
    toc.removeChild(tocEntriesToRemove[i]);
  }

  // Rebuild TOC entries.
  var entries = tocEntries(document.getElementById("content"), toclevels);
  for (var i = 0; i < entries.length; ++i) {
    var entry = entries[i];
    if (entry.element.id == "")
      entry.element.id = "_toc_" + i;
    var a = document.createElement("a");
    a.href = "#" + entry.element.id;
    a.appendChild(document.createTextNode(entry.text));
    var div = document.createElement("div");
    div.appendChild(a);
    div.className = "toclevel" + entry.toclevel;
    toc.appendChild(div);
  }
  if (entries.length == 0)
    toc.parentNode.removeChild(toc);
},


/////////////////////////////////////////////////////////////////////
// Footnotes generator
/////////////////////////////////////////////////////////////////////

/* Based on footnote generation code from:
 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 */

footnotes: function () {
  // Delete existing footnote entries in case we're reloading the footnodes.
  var i;
  var noteholder = document.getElementById("footnotes");
  if (!noteholder) {
    return;
  }
  var entriesToRemove = [];
  for (i = 0; i < noteholder.childNodes.length; i++) {
    var entry = noteholder.childNodes[i];
    if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
      entriesToRemove.push(entry);
  }
  for (i = 0; i < entriesToRemove.length; i++) {
    noteholder.removeChild(entriesToRemove[i]);
  }

  // Rebuild footnote entries.
  var cont = document.getElementById("content");
  var spans = cont.getElementsByTagName("span");
  var refs = {};
  var n = 0;
  for (i=0; i<spans.length; i++) {
    if (spans[i].className == "footnote") {
      n++;
      var note = spans[i].getAttribute("data-note");
      if (!note) {
        // Use [\s\S] in place of . so multi-line matches work.
        // Because JavaScript has no s (dotall) regex flag.
        note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
        spans[i].innerHTML =
          "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
          "' title='View footnote' class='footnote'>" + n + "</a>]";
        spans[i].setAttribute("data-note", note);
      }
      noteholder.innerHTML +=
        "<div class='footnote' id='_footnote_" + n + "'>" +
        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
        n + "</a>. " + note + "</div>";
      var id =spans[i].getAttribute("id");
      if (id != null) refs["#"+id] = n;
    }
  }
  if (n == 0)
    noteholder.parentNode.removeChild(noteholder);
  else {
    // Process footnoterefs.
    for (i=0; i<spans.length; i++) {
      if (spans[i].className == "footnoteref") {
        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
        href = href.match(/#.*/)[0];  // Because IE return full URL.
        n = refs[href];
        spans[i].innerHTML =
          "[<a href='#_footnote_" + n +
          "' title='View footnote' class='footnote'>" + n + "</a>]";
      }
    }
  }
},

install: function(toclevels) {
  var timerId;

  function reinstall() {
    asciidoc.footnotes();
    if (toclevels) {
      asciidoc.toc(toclevels);
    }
  }

  function reinstallAndRemoveTimer() {
    clearInterval(timerId);
    reinstall();
  }

  timerId = setInterval(reinstall, 500);
  if (document.addEventListener)
    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
  else
    window.onload = reinstallAndRemoveTimer;
}

}
asciidoc.install();
/*]]>*/
</script>
</head>
<body class="article">
<div id="header">
<h1>[Git GUIDE] Advanced use</h1>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>This guide is meant to help and provide information for those who want dig into the Git depths and explore its mysteries!</p></div>
<div class="paragraph"><p>It is likely very much possible, that many of these things can be done with GUIs, but this topic expects that the command line interfact (Git Bash) is used!</p></div>
<div class="paragraph"><p>Have phun with Git :)</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_setup_git_for_scriptdev2">1. Setup Git for ScriptDev2</h2>
<div class="sectionbody">
<div class="sect2">
<h3 id="_copy_the_offical_branch_to_your_system">1.1. "Copy" the offical branch to your system</h3>
<div class="paragraph"><p>Execute this within your &lt;MaNGOS&gt;/src/bindings directory</p></div>
<div class="paragraph"><p><tt>$ git clone git://github.com/scriptdev2/scriptdev2.git ScriptDev2</tt><br />
and <tt>$ cd</tt> into it.</p></div>
</div>
<div class="sect2">
<h3 id="_setup_some_individual_configuration">1.2. Setup some individual configuration</h3>
<div class="sect3">
<h4 id="_username_and_email">1.2.1. Username and Email</h4>
<div class="paragraph"><p><tt>$ git config --global user.name "Your (Nick)Name"</tt><br />
<tt>$ git config --global user.email "some@email.adress"</tt></p></div>
</div>
<div class="sect3">
<h4 id="_make_life_more_colorful">1.2.2. Make life more colorful</h4>
<div class="paragraph"><p><tt>$ git config --global color.ui "auto"</tt></p></div>
</div>
<div class="sect3">
<h4 id="_change_the_default_editor">1.2.3. Change the default editor</h4>
<div class="paragraph"><p>Thanks to DasBlub and Zor for help with this. This is just an example for notepad++, so you might need to adapt to your needs (especially the path)</p></div>
<div class="paragraph"><p><tt>$ git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"</tt></p></div>
</div>
<div class="sect3">
<h4 id="_lineendings_configuration">1.2.4. Lineendings-configuration</h4>
<div class="paragraph"><p>This is actually fairly dependend from own wishes - if you feel uneasy, stay with default values</p></div>
<div class="sect4">
<h5 id="_windows">Windows</h5>
<div class="paragraph"><p><tt>$ git config core.autocrlf true</tt><br />
<tt>$ git config core.eol native</tt></p></div>
</div>
<div class="sect4">
<h5 id="_nix">*nix</h5>
<div class="paragraph"><p><tt>$ git config core.autocrlf input</tt><br />
<tt>$ git config core.eol native</tt></p></div>
</div>
</div>
<div class="sect3">
<h4 id="_whitespace_pre_commit_hook">1.2.5. Whitespace pre-commit hook</h4>
<div class="paragraph"><p>This is really nice to force you to not commit code with corrupt whitespace (Needs to be set-up for every repository individually)</p></div>
<div class="paragraph"><p><tt>$ cp .git/hooks/pre-commit.sample .git/hooks/pre-commit</tt><br />
This activates the default pre-commit hook, if the file doesn&#8217;t exist, update your git-version (and after your repo)</p></div>
</div>
</div>
<div class="sect2">
<h3 id="_use_an_external_merge_tool">1.3. Use an external merge-tool</h3>
<div class="paragraph"><p>see <a href="http://getmangos.com/community/forum/27/source-code-management/TODOTODO"><em>Freghar</em>'s Thread</a></p></div>
<div class="sect3">
<h4 id="_kdiff3_not_kdiff_or_kdiff2">1.3.1. KDiff3 (not kdiff or kdiff2)</h4>
<div class="paragraph"><p>Reasons why to use <a href="http://kdiff3.sourceforge.net/doc/merging.html">KDiff3</a>:</p></div>
<div class="ulist"><ul>
<li>
<p>
has a fairly good visual interface and works on both windows and linux
</p>
</li>
<li>
<p>
you can get it from <a href="http://sourceforge.net/project/showf&#8230;ease_id=501369">TODO</a>
</p>
</li>
<li>
<p>
to make sure git can find it, for example on windows if you installed it to <tt>c:/Program Files/KDiff3</tt><br />
<tt>$ git config mergetool.kdiff3.path "c:/Program Files/KDiff3/kdiff3.exe"</tt>        &#8592; either that or you could add <tt>c:/Program Files/KDiff3</tt> to your path
</p>
</li>
<li>
<p>
make it the default mergetool:<br />
<tt>$ git config merge.tool kdiff3</tt>
</p>
</li>
</ul></div>
</div>
<div class="sect3">
<h4 id="_tortoise_git_merge">1.3.2. Tortoise(Git) Merge</h4>
<div class="paragraph"><p>Reasons why to use <a href="http://code.google.com/p/tortoisegit/">TortoiseGit</a>:</p></div>
<div class="ulist"><ul>
<li>
<p>
similar to well known TortoiseSVN software (a nice GUI tool for Git anyways)
</p>
</li>
<li>
<p>
does not require any further configuration to work as default merge tool (provided no other is installed)
</p>
</li>
</ul></div>
</div>
<div class="sect3">
<h4 id="_tortoise_merge">1.3.3. Tortoise Merge</h4>
<div class="paragraph"><p>Reasons why to use <a href="http://tortoisesvn.tigris.org/TortoiseMerge.html">TortoiseMerge</a></p></div>
<div class="ulist"><ul>
<li>
<p>
Good visual interface, only works on windows
</p>
</li>
<li>
<p>
Download and install <a href="http://tortoisesvn.net/downloads">TortoiseSVN</a>
</p>
</li>
<li>
<p>
In <tt>C:\Program Files\TortoiseSVN\bin</tt> create a file named TortMer.bat and add the following:
</p>
<div class="listingblock">
<div class="content">
<pre><tt>@ECHO OFF
TortoiseMerge.exe /base:"%PWD%/%1" /theirs:"%PWD%/%2" /mine:"%PWD%/%3" /merged:"%PWD%/%4"</tt></pre>
</div></div>
</li>
<li>
<p>
add a custom merge tool to git that runs this batch file<br />
<tt>$ git config mergetool.tortoise.cmd ' "cmd.exe" "/CTortMer.bat" "$BASE" "$REMOTE" "$LOCAL" "$MERGED" '</tt>
</p>
</li>
<li>
<p>
make it the default mergetool<br />
<tt>$ git config merge.tool tortoise</tt>
</p>
</li>
</ul></div>
</div>
</div>
</div>
</div>
<div class="sect1">
<h2 id="_some_links">2. Some Links</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="http://git-scm.com/">http://git-scm.com/</a> - Contains nearly everything one might want :)</p></div>
<div class="sect2">
<h3 id="_obtaining_git">2.1. Obtaining Git</h3>
<div class="paragraph"><p>For *nix you should get Git from your distribution software repository.</p></div>
<div class="paragraph"><p>For Windows yout can get <a href="http://code.google.com/p/msysgit/downloads/list">mysysgit</a> - you would probably want Git-w.x.y.z.previewYYYYMMDD.exe</p></div>
</div>
<div class="sect2">
<h3 id="_some_graphical_user_interfaces">2.2. Some Graphical User-Interfaces</h3>
<div class="paragraph"><p>(Not recommanded, but might make you happy)</p></div>
<div class="paragraph"><p><a href="http://code.google.com/p/tortoisegit/">TortoiseGit</a> - Similar to TortoiseSVN Shell-Extention based GUI</p></div>
<div class="paragraph"><p><a href="http://www.syntevo.com/smartgit/index.html">SmartGit</a> - More classical GUI, looks nice</p></div>
</div>
<div class="sect2">
<h3 id="_documentation_links">2.3. Documentation-Links</h3>
<div class="paragraph"><p><a href="http://www.kernel.org/pub/software/scm/git/docs/everyday.html">http://www.kernel.org/pub/software/scm/git/docs/everyday.html</a> - Small overview of common commands</p></div>
<div class="paragraph"><p><a href="http://git-scm.com/course/svn.html">http://git-scm.com/course/svn.html</a> - SVN Crash Course, especially for *nix user</p></div>
<div class="paragraph"><p><a href="http://book.git-scm.com/">http://book.git-scm.com/</a> - Very nice, including flash videos about most topics</p></div>
<div class="paragraph"><p><a href="http://progit.org/book/">http://progit.org/book/</a> - A bit more detailed</p></div>
<div class="paragraph"><p><a href="http://getmangos.com/community/forum/27/source-code-management/">http://getmangos.com/community/forum/27/source-code-management/</a> - Collection of various topics on MaNGOS</p></div>
</div>
<div class="sect2">
<h3 id="_what_is_this_git_about">2.4. What is this Git about?</h3>
<div class="paragraph"><p><a href="http://www.youtube.com/watch?v=4XpnKHJAok8">Google TechTalk by <em>L. Torvalds</em></a></p></div>
<div class="paragraph"><p><a href="http://www.youtube.com/watch?v=8dhZ9BXQgc4">Google TechTalk by <em>R. Schwartz</em></a></p></div>
<div class="paragraph"><p><a href="https://git.wiki.kernel.org/index.php/GitSvnComparison">Compate Git vs. SVN</a></p></div>
</div>
</div>
</div>
<div class="sect1">
<h2 id="_most_important_git_commands">3. Most important Git-commands</h2>
<div class="sectionbody">
<div class="paragraph"><p>Based on <em>Freghar</em>'s Thread</p></div>
<div class="paragraph"><p>Remark that all these commands display a very exhaustive help page with ` --help`</p></div>
<div class="hdlist"><table>
<tr>
<td class="hdlist1">
<tt>$ git clone</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
downloads a fresh repo.
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git pull</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
is a shortcut for fetch and merge.
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git log</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
displays the history
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git show</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
shows the most recent commit
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git commit</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
commits your changes (always local)
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git checkout</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
switches the source to a specific version (local branch or commit)
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git merge</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
merges changes from one point into current branch
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git reset</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
leaves you on the current branch but changes what the branch "points to".
</p>
</td>
</tr>
</table></div>
</div>
</div>
<div class="sect1">
<h2 id="_workflow_with_git">4. Workflow with Git</h2>
<div class="sectionbody">
<div class="paragraph"><p><strong>Commit early, commit often</strong></p></div>
<div class="hdlist"><table>
<tr>
<td class="hdlist1">
<tt>$ git pull</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
to be on recent version
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git checkout -b &lt;NewBranchName&gt;</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
create a new branch for the work
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
Suggestion
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
Create for <em>every</em> project an own branch, this makes maintaining way easier!
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
&lt;edit some files&gt; 
<br />
</td>
<td class="hdlist2">
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git diff</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
see what is done since last commit
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git commit -a -m "Some Commit Message"</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
this is only locally
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
&lt;edit and commit more&gt; 
<br />
</td>
<td class="hdlist2">
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git diff master</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
see what is done compared to master branch
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git checkout master</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
change to master branch
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git pull</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
there was an update in master, now we pulled this, tested it, and now we want to get our working branch up-to-date
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git checkout &lt;BranchName&gt;</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
switch back to our working branch
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git rebase master</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
set to state of master and rebase the own commits on top
</p>
</td>
</tr>
<tr>
<td class="hdlist1">
<tt>$ git format-patch master --stdout &gt; fileName.patch</tt> 
<br />
</td>
<td class="hdlist2">
<p style="margin-top: 0;">
Creates a nice formated patch into file "fileName.patch"
</p>
</td>
</tr>
</table></div>
</div>
</div>
<div class="sect1">
<h2 id="_create_and_apply_patches">5. Create and apply patches</h2>
<div class="sectionbody">
<div class="sect2">
<h3 id="_create_patches">5.1. Create patches</h3>
<div class="paragraph"><p><tt>$ git format-patch master</tt> - creates a patchfile for every commit that diffs from master (includes author information)</p></div>
<div class="paragraph"><p><tt>$ git format-patch master --std.out &gt; someFilename.patch</tt> - creates an incremental patchfile, containing information of each individual commit</p></div>
</div>
<div class="sect2">
<h3 id="_apply_patches">5.2. Apply patches</h3>
<div class="paragraph"><p><tt>$ patch -X -d. &lt; someFilename.patch</tt>  - applies a patch in Git(X = 1) or SVN (X = 0) format to current workspace</p></div>
<div class="paragraph"><p><tt>$ git apply someFilename.patch</tt>  - applies a Git-patch to current workspace</p></div>
<div class="paragraph"><p><tt>$ git am someFilename.patch</tt>  - applies and commits a Git-patch with commit information (created by format-patch)</p></div>
</div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2012-05-10 14:37:55 Mitteleuropäische Sommerzeit
</div>
</div>
</body>
</html>
